Fixed: tests, somehow