cleanup dependencies to get tests up and running Change-Id: I6d322e5be13707aa89670cb85ff612f6de01929a