ticket:3 Fixed tests and models