Fixes unit tests so they pass