Remove unneeded declarations in unit tests

Change-Id: I75e3a60ef7720011aa2bd3610bbc60d14140bdaa
Merge "Remove unneeded declarations in unit tests"