Adding Acceptance and Unit Tests