Fix tests to actually work!