little bit of test optimization, Closes GH-711 too