Options and resources no longer singletons and instances can be passed around. Remove old TDD tests.