PHOENIX-674 Make unit test suite run faster (SamarthJain)