Cleaning up Parameter and adding tests