Removed old testing code from a couple modules