Add: Improved testing