middle of fixing repository and tests