added unit tests for more of the functionality