[BACKLOG-290] Added jmeter tests and some cleanup