Add fmap test
Cleanup