Tidy up testdata
Prepare for phpbb3 tests
Add phpbb3 tests