Fix tests

Fix tests