some minor optim via test