fix warnings
fix whitespace
Add test cases citrin hangs on