Refactor test to work with 1.0.x