GPII-672: Added testcases, cleaned up handler a bit, started POST work