Merge changes Ieed58e27,I61212a80

* changes:
  Make the APF tests a bit more realistic.
  Add more RA tests to ApfTest.