Added database cleaner and mapper