Add Issue 22 testing