minor comments and cleanings to the tests