Refactor Unit Tests to include Mockit for better testing