fix unit tests;
migrate ncss validation (2)