ticket:3. Tests fixed
Merge branch 't3_middleware' of https://github.com/chupakabra/test into t3_middleware