Add server testing, scaffold for client and e2e.
Merge commit.
Merge commit 2.
Merge pull request #170 from SterlingVix/testing/moreServerTesting

(testing) Add server testing, scaffold for client and e2e