B 60837 tests

This pull request has all of Seth's changes + all functional tests.  Please use this as a new pull request.