Some changes to try make tests to pass