remove debug code checkin
more tests and associated fixes