baj645 acceptance and unit tests