Small refactoring and adds red test for number 3