Filled out more of the test coverage, methods