Added unit test
Refactored unit tests

- Moved variable tests to separate test class