Simplify and correct Chirp tests.