Renaming variables to be more intuitive
Adding tests for v3.3