API working with tests (some bdd fails).  Good checkpoint before renaming