Fixed module implementations for tests