Unittests subfolders

Aids adding more tests in the future.