Fix dirty database scenario test (manual cleanups)