Update dirty queue algorithm, refactor test properties into one class.