Restructure tests so that the lines being tested are displayed when the test is run.