Add: Yet more testing