comment out rather then ignore the one test
Fixed nunit test
Fixed merge issues
fixed merge