refactor: changes to make all tests work