added to acceptance and unit tests and passed