Adding further tests
Created some helper methods for unit tests