code cleanup - removed unused constructor and fixed unit test