get tests passing on 1.8.7