Initial impl of Junit test coverage