switch to NUnit for testing
test restructure (just a bit)