Removed the tests, will put into another file