* Increased test coverage