Module fixes

Un-exclude a number of module tests, fix three minor features.