Added more test coverage to bring up to 100%