Fix expected values for tests