Moved addTestSuite to the top in two files, moved constraints to a variable