Adding neglected member initializer
Removing redundant unit test code
Implementing remainder of diamond test