Updated tests for commit 117cadae