microoptimization
tests fixed