added testing features