Fix test data and relax assertions, close #2