ticket:3 Upgraded tests