Fix tests and stuff