Polish tests and prep for adding interrupt tests.