added junit tests!