Added testing features