Make all tests pass

Change-Id: I49ea430c5d7cd7694d7937ffe7298c8fcd2462f4