Clean up issues in tests
Merge pull request #167 from VSEphpbb/test-fixes

Clean up issues in tests