Minor changes to run tests correctly