Improved junit runner and constraint order sorted