test passes 

fixes #4 and fixes #5  (at least should)