Fixes failing unit tests