Strict mass assignment, making tests pass