Added yield/q test