* updated tests and coverage