Passing tests and refactored fakerdnd.rb