Fix tests to actually pass