MBH: clean up and adding in current content test