missed some replacements... now tests should work