adapter sync class bug fixes and test updates