Fix tests, some test commented out