Merge pull request #99 from VSEphpbb/tests-fixes

Some additional fixes, updates, and new tests
Merge branch 'master' into tests-fixes