Revert to 94528e90771fe3c96fd9190a85f4b039a755c1e4
Fixed tests