Changes based on unit test items and changed up my unit test to match Stephen's

Changes based on unit tests and unit tests finished to date.