Added tests to NUnit.
Removed Old tests