Updated tests (fix #3)