Fixed issues with running of tests.