Fix tests and stuuff