Fixed unresolved tests
Removed unnecessary tests