Make the tests pass (to be later ported to rspec-system tests… since the current unit tests aren't particularly useful.. it is mainly duplicating implementation logic..)