Amending some of Dwight's comments. Adding back the tests.