Organized constraints test and made sort test a real test!