moved code from NTestCase, Unit Tests missing