Revise tests to fit current state of code