Add: Improved tests