Horrible code duplication, but tests run again (slow though.)