Modified invokation syntax.

Signed-off-by: Tom Swindell <t.swindell@rubyx.co.uk>
Updated grouper, added tilapia and proper cleanup.

Signed-off-by: Tom Swindell <t.swindell@rubyx.co.uk>