Updates to rbapf_test.py