Added a unit test
completed some basic excercises