Added testing scheme