Resolves #238
hopefully make the tests run faster