Updated tests with current syntax