bug fix and extra test data