Increased test coverage again