Additional acceptance and unit tests