Updated tests for latest touchups