Added tests and coverage info