More mock server stuff
Merged with Josh's changes
Mock server changes
Mock server test blocks added
Merge pull request #194 from iameric1986/master

More mock server stuff