Speed up tests from 25s to 0.137s