Added tests for @chanceraine and @phaley