More simplification
Fixed failing tests