Cleared more tests