Actually making all tests pass

src/ORM/EagerLoader.php

@@ -67,6 +67,7 @@ class EagerLoader {
 	public function contain($associations = null, $override = false) {
 		if ($this->_containments === null || $override) {
 			$this->_containments = new \ArrayObject;
+			$this->_normalized = null;
 		}
 
 		if ($associations === null) {

src/ORM/Query.php

@@ -307,6 +307,10 @@ class Query extends DatabaseQuery {
  * @return \ArrayObject|Query
  */
 	public function contain($associations = null, $override = false) {
+		if (empty($associations) && $override) {
+			$this->_eagerLoader = null;
+		}
+
 		$result = $this->eagerLoader()->contain($associations, $override);
 		if ($associations !== null || $override) {
 			$this->_dirty();