Basic post model tests, resolves #33
Resolved merge conflicts