Jay to the rescue (as always)

Fixed the two tests and learned some good debugging techniques