Cleaned up previous checkin - had accidentally left some debug statments in and also cleaned up some of the test output to make it easier to follow. In most cases i simply commented out so that debug statements can be easily resintated.