W4-A3 TODOs completed and tests succeded