All of CR's tests fail, had to refacto rename some functions