Clean up test_api_samples a bit

Remove all unnecessary return statements in our tests

Change-Id: Ic01a211e48781241cac3fdef75760a3a6dafadc6
Merge "Clean up test_api_samples a bit"