Added (& fixed!) new tests