New acceptance and unit tests