More testing

Change-Id: I17d28bf0c139e1c2a834e1379969caf9a9595383