Moved the tests to their own folder, added custom constraints