restructure speed tests to make them easier to maintain