Refactored unit tests

- Moved conditional tests to separate test class