some armassist cleanup and small changes to cbpy_test_osx.py