Fix tests suite after major refactor