Added datamapper and database cleaner