Added the tests from the original project