Removed unuseful assertion
Test refactor
Added missing assertion
Test refactor