Refactor, adjust tests