fix tests and add mutable mass