More fixes to setup script, easyfying running tests.