baj645 acceptance and unit tests
baj645 acceptance and unit tests