fixing stupid merge error and tests