JavaDoc updates
Merge branch 'account_store_mapping' into custom_data
Fixed test assertions (equals arguments were reversed)