Tests refactoring
more assertions in tests