Start by fixing existing suite.