Adding database cleaning strategy

Since adding validation, the sequence of tests were important.