Cleanup of tests
  - use assertEqual
  - use centralized definitions for the various optimizer parameter permutations