Initialization and tests corrected