Add DatabaseCleaner block - needs to be fixed