Renaming field for parity between classes.
Cleaning up using statements.
Adding test for full spectrum of possible values.