Started to add tests for choker. Not complete.