moved two tests from maybe to fmap