merge OOP breadcrumb and unit tests