[BACKLOG-290] Added jmeter tests and some cleanup
Merge pull request #476 from bmorrise/dev

[BACKLOG-290] Added jmeter tests and some cleanup