Removed unused middleware imports.
Fixed test assertions.