Improve speed of tests #54