added all tests requested by Jay