Now with passing BDD tests #4