Tidying up test to all fit in one short method.