Finalized ADCP functions and test cases