Feature/use database cleaner master