Improved Mapper and typeclasses, new flatspec tests