Make tests pass
Update documentation after BC restructuring