More tests and xfer data

Change-Id: Ie996201d70cbbbda64762632ddb7e51efbe1e400