Changed the testing approach, now using MSUnit