Added manual initialization and tests