Fixing account find and update, adding more tests