Added test coverage.
Removed unused constructor