Restored test suite