Added one unit test.. Need to add a few more