New tests

Change-Id: I8b5acd86c2fe29841216f01fc1901b8fefab63e5