Small refactor, fixed breaking tests