ticket:3 fixes, middleware + test
ticket:3 finish
ticket:3 fixes