fixed worker, WiP tests and will separate objects later