added testing and complete containsBP