added some corrections to make test reliable