tests pass

pulled from 106e0a3e28ebd6570fcdd5e6ca698eafb361d3c8 on 1.0-alpha branch