Finished style changes for model and tests.