addressed all comments left by Arthur
update tests