Started work towards adding test case