Fix tests. Still incomplete