Moved common things to test class - added second test case