Added testing extras