Added testing module support