Cleaned up load procedure
Added unit test coverage reportability
cleaned up comments