A couple of automated test fixes

Tag search fix from Scott! Also fix to the optional tags test which had not actually been run thanks to dropbox snafu sigh :P

Signed-off-by: shalott <shalott@gmail.com>
Merge pull request #1322 from shalott/test_fixes

A couple of automated test fixes
Cleaning up a couple more tests.
Merge pull request #1323 from scottsds/other_test_fixes

Cleaning up a couple more tests.