Add junit coverage for three classes