Rewrote constructor tests to use mocks