fix some tests before merging