Removed adapter, fixed most account values and tests