Wrote wrapping tests and implementation

Changed tests to shouldWhen naming
given/when/then is already there in the tests
http://stackoverflow.com/questions/7665412/writing-first-junit-test was
a nice summary