Issue 4: All Tests moved to the tests folder