The tests so far only tested SGsAP alone, which doesn't get us very far. Let's add interfacing with the S1, too. Change-Id: Id54071b901db720a0f88b91cdc5a8e09bea0fb58
Change-Id: Idbd54838daaf12acccc3253dc4278de75eaaaf31