MEDIUM / Attempt to fix unit tests