Added increased test coverage