Made test-enabled units more basic, removing superfluous fields.
Cleaned up test path assignment code.