mshah - cleaning up the test