JUNIT tests added