I've also done that first in my pull request #19 but this broke some tests for me when running them with nunit runnner. Does this work for you? I've also splitted the tests out into separate files :)