Fixed build error. Cleaned up test-case table a little.