Fixed failing tests from interface refactor