Tests now completely pass in under 2 seconds.