Updated the tests to be CDK-like (no changed assertions)

Change-Id: I7972c63024b76a723b6852cbfa3120cf8fee2d53