Fixed running of tests