Fix tests

Fix tests #1897