Fix tests for now