fix tests and make test for divertor
Merge branch 'master' of git://github.com/aaroncbader/hsx_bs