Improved. Test coverage