Fix for #7 and #8 backported from NUnit3 #70 and #90

This is the backported fix for #7 and #8 coming from nunit/nunit#70 and nunit/nunit#90. The two issues were fairly intertwined, so it was easier to backport them both together.