Changes for funtional Spec

As laid out in RSpec file