Take Joe's comments, get tests passing