Fix tests. Good stuff.