ticket:9 Improved tests