finished more junit tests