Revised JUNIT tests