Updating tests and adding scalar methods.