Acceptance and Unit Tests

Added Acceptance and Unit Tests