Fix BDD tests to correct for model changes

Correct BDD tests & scaffold that broken when models changed

Minor UI update to show more barclamp data for troubleshooting.