Minor cleanup after merge with Nick's branch. Removed residual .doc and .test module files