Add some testing features