Moved resolve test cases to unit tests
Moved tests to test class