Performance engineering
Fixed some test failures