[sam_bristow]

Also, the commit adding the failing test isn't breaking anything, its demonstrating the already broken nature of the existing codebase.