Added new const handlers, cleaned up old const vars
Woops, recommit as there was an error that made it through
Built prototype for mock server
caching for branch switch
Completed transistion into new test case design, with confirmation that it passes as expected