Fix tests and trying something.