Finalizing Model and unit tests