Move acceptane of MATCH to it's own test suite
Move out agreggation into its own acceptance test class
Break out acceptance tests of RETURN into it's own class