Conserved to primitive inversion test.
Code cleanup.