Added new and improved tests for @monocleman and @chanceraine