refactor tests to go ~4-5x faster by using fewer steps