Add a compound test
Fix typing