Fix unit test groups for two classes recently moved from lib to repo

Change-Id: Ic6fca11f5cce2a34f09a3a8f68e6849e29dbe174