To be able to write more precise unit tests in the future Change-Id: I8f45947dfacca501acd856849bd978fad0f735cd