ISPN-3225 Clean up test suite