Added testing facilities to master