Refactored to use initializer
fixed test B0001