diff --git a/model/Image.php b/model/Image.php
index c38ed012b..55c2f632d 100644
--- a/model/Image.php
+++ b/model/Image.php
@@ -612,7 +612,6 @@ class Image extends File implements Flushable {
 				closedir($handle);
 			}
 		}
-		$pattern = "/^(({$generateFuncs}).*\-)+" . preg_quote($this->Name) . "$/i";
 
 		$pattern = $this->getFilenamePatterns($this->Name);
 
diff --git a/security/CMSSecurity.php b/security/CMSSecurity.php
index 2e9931497..589136ecd 100644
--- a/security/CMSSecurity.php
+++ b/security/CMSSecurity.php
@@ -52,8 +52,8 @@ class CMSSecurity extends Security {
 		return $this;
 	}
 
-	protected function getLoginMessage() {
-		return parent::getLoginMessage()
+	protected function getLoginMessage(&$messageType = null) {
+		return parent::getLoginMessage($messageType)
 			?: _t(
 				'CMSSecurity.LoginMessage',
 				'<p>If you have any unsaved work you can return to where you left off by logging back in below.</p>'
@@ -157,12 +157,12 @@ PHP
 		user_error('Passed invalid authentication method', E_USER_ERROR);
 	}
 
-	protected function getTemplatesFor($action) {
+	public function getTemplatesFor($action) {
 		return array("CMSSecurity_{$action}", "CMSSecurity")
 			+ parent::getTemplatesFor($action);
 	}
 
-	protected function getIncludeTemplate($name) {
+	public function getIncludeTemplate($name) {
 		return array("CMSSecurity_{$name}")
 			+ parent::getIncludeTemplate($name);
 	}
diff --git a/security/MemberAuthenticator.php b/security/MemberAuthenticator.php
index 5ae1a2458..e77d25b50 100644
--- a/security/MemberAuthenticator.php
+++ b/security/MemberAuthenticator.php
@@ -67,6 +67,7 @@ class MemberAuthenticator extends Authenticator {
 		if($member && !$asDefaultAdmin) {
 			$result = $member->checkPassword($data['Password']);
 			$success = $result->valid();
+		} else {
 			$result = new ValidationResult(false, _t('Member.ERRORWRONGCRED'));
 		}
 
@@ -116,8 +117,7 @@ class MemberAuthenticator extends Authenticator {
 			} else {
 				// Audit logging hook
 				singleton('Member')->extend('authenticationFailedUnknownUser', $data);
-
-			$attempt->Email = $userEmail;
+			}
 		}
 
 		$attempt->Email = $email;
diff --git a/security/Security.php b/security/Security.php
index dc6617a30..4f0ea70d0 100644
--- a/security/Security.php
+++ b/security/Security.php
@@ -450,7 +450,7 @@ class Security extends Controller implements TemplateGlobalProvider {
 	 * @param string $action
 	 * @return array Template list
 	 */
-	protected function getTemplatesFor($action) {
+	public function getTemplatesFor($action) {
 		return array("Security_{$action}", 'Security', $this->stat('template_main'), 'BlankPage');
 	}
 
diff --git a/tests/forms/FormTest.php b/tests/forms/FormTest.php
index 29d32449f..f9d6566a8 100644
--- a/tests/forms/FormTest.php
+++ b/tests/forms/FormTest.php
@@ -535,8 +535,8 @@ class FormTest extends FunctionalTest {
 		$form->Controller()->handleRequest(new SS_HTTPRequest('GET', '/'), DataModel::inst()); // stub out request
 		$form->addErrorMessage('key1', '<em>Escaped HTML</em>', 'good', true);
 		$form->setupFormErrors();
-		$parser = new CSSContentParser($form->forTemplate());
-		$messageEls = $parser->getBySelector('#key1 .message');
+		$parser = new CSSContentParser($result = $form->forTemplate());
+		$messageEls = $parser->getBySelector('#Form_Form_key1_Holder .message');
 		$this->assertContains(
 			'&lt;em&gt;Escaped HTML&lt;/em&gt;',
 			$messageEls[0]->asXML()
@@ -547,7 +547,7 @@ class FormTest extends FunctionalTest {
 		$form->addErrorMessage('key1', '<em>Unescaped HTML</em>', 'good', false);
 		$form->setupFormErrors();
 		$parser = new CSSContentParser($form->forTemplate());
-		$messageEls = $parser->getBySelector('#key1 .message');
+		$messageEls = $parser->getBySelector('#Form_Form_key1_Holder .message');
 		$this->assertContains(
 			'<em>Unescaped HTML</em>',
 			$messageEls[0]->asXML()
diff --git a/tests/model/DataListTest.php b/tests/model/DataListTest.php
index f068ce11a..d1334b985 100755
--- a/tests/model/DataListTest.php
+++ b/tests/model/DataListTest.php
@@ -124,13 +124,13 @@ class DataListTest extends SapphireTest {
 
 	public function testDistinct() {
 		$list = DataObjectTest_TeamComment::get();
-		$this->assertContains('SELECT DISTINCT', $list->dataQuery()->sql(), 'Query is set as distinct by default');
+		$this->assertContains('SELECT DISTINCT', $list->dataQuery()->sql($params), 'Query is set as distinct by default');
 
 		$list = $list->distinct(false);
-		$this->assertNotContains('SELECT DISTINCT', $list->dataQuery()->sql(), 'Query does not contain distinct');
+		$this->assertNotContains('SELECT DISTINCT', $list->dataQuery()->sql($params), 'Query does not contain distinct');
 
 		$list = $list->distinct(true);
-		$this->assertContains('SELECT DISTINCT', $list->dataQuery()->sql(), 'Query contains distinct');
+		$this->assertContains('SELECT DISTINCT', $list->dataQuery()->sql($params), 'Query contains distinct');
 	}
 
 	public function testDataClass() {
diff --git a/tests/model/DataQueryTest.php b/tests/model/DataQueryTest.php
index e010fc0a6..b90e01a1b 100644
--- a/tests/model/DataQueryTest.php
+++ b/tests/model/DataQueryTest.php
@@ -54,7 +54,7 @@ class DataQueryTest extends SapphireTest {
 		//apply a relation to a relation from an ancestor class
 		$newDQ->applyRelation('TestA');
 		$this->assertTrue($newDQ->query()->isJoinedTo('DataQueryTest_C'));
-		$this->assertContains('"DataQueryTest_A"."ID" = "DataQueryTest_C"."TestAID"', $newDQ->sql());
+		$this->assertContains('"DataQueryTest_A"."ID" = "DataQueryTest_C"."TestAID"', $newDQ->sql($params));
 	}
 
 	public function testRelationReturn() {
@@ -174,13 +174,13 @@ class DataQueryTest extends SapphireTest {
 
 	public function testDistinct() {
 		$query = new DataQuery('DataQueryTest_E');
-		$this->assertContains('SELECT DISTINCT', $query->sql(), 'Query is set as distinct by default');
+		$this->assertContains('SELECT DISTINCT', $query->sql($params), 'Query is set as distinct by default');
 
 		$query = $query->distinct(false);
-		$this->assertNotContains('SELECT DISTINCT', $query->sql(), 'Query does not contain distinct');
+		$this->assertNotContains('SELECT DISTINCT', $query->sql($params), 'Query does not contain distinct');
 
 		$query = $query->distinct(true);
-		$this->assertContains('SELECT DISTINCT', $query->sql(), 'Query contains distinct');
+		$this->assertContains('SELECT DISTINCT', $query->sql($params), 'Query contains distinct');
  	}
 	
 	public function testComparisonClauseInt() {
diff --git a/tests/model/ImageTest.php b/tests/model/ImageTest.php
index 912f34422..a8b5b2124 100644
--- a/tests/model/ImageTest.php
+++ b/tests/model/ImageTest.php
@@ -231,7 +231,7 @@ class ImageTest extends SapphireTest {
 	}
 
 	/**
-	 * @expectedException PHPUnit_Framework_Error
+	 * @expectedException InvalidArgumentException
 	 */
 	public function testGenerateImageWithInvalidParameters() {
 		$image = $this->objFromFixture('Image', 'imageWithoutTitle');