added some testing features