Add missing test files.
Rework what I'm doing so that the tests are completely seperate.