testing in progress
client side tests working, server mocks/responses working.
Merge pull request #42 from owen-d/master

client tests working