Fix TestInventory Unit Tests

Uncomment test_dir_inventory and add commits from g-k-r.

Minor updating made to inventory parsing to get the test cases to work. See 16fe09e for more details.