More work on testing stuff with spinach and things