Attempting to add Unit Tests