added payment model; updated tests