Starting to add Unit Tests