Still trying to make the tests work