Updated tests (missing from previous commit)