Updated tests to match #335