Bug fixes to vorticity calcs and unit tests