Move files around in testing.
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev