Added test, 82/84 now pass