refactor y tests