Fixed some expected dir names in tests.
Made tool assertion test more OS-specific
Made tool assertion test more OS-specific