Add first round of junit tests