restoring tests
Fix tests