* Fix constants so that works again.
* Fix formatting of test output
* Put FBC tests in their own suite.