Changes for portability and TDD use
NOSE stuff for TDD