Start rewrite of TestRequirement