* changing unit test code to work w/ PTVS