Restructured everything in test module. Now it should just be tp continue writing tests.