Test refactoring
Added custom assertions to simplify tests code