restored test class which is used by uber test suite as well