micro optim
pass more tests