Modified to support new tests