Need to be explicit in singleton registration
Added acceptance test