All non-test code has now been extracted