Added testing ability