CH-1306: Incorporating mid-sprint review feedback
CH-1306: Adding tests for processing server-side actions