Cleaned up models and closed file.
Updated unit testing suite.