jkhust updated acceptance and unit tests.