added testing
added testing features