all implemented junit tests working