Refactoring existing tests tests

Refactored tests