fix regression, couple more tests