Refactor further tests
Refactor further tests