rearrange ham scons test

as prep for adding bcrham tests
finish adding bcrham tests