Reduced the size of the main testing code yet moar

Signed-off-by: Andrew Lowther <andy.lowther@mademedia.co.uk>