Added doc support and initial test support