Adding test tools