ticket:8 Improved tests