fixing fixes and tests