Fixed Failing Tests
Removed NOX