Fixed module usage and test benches