Updated tests using YML