partially done statements, fixed an error and uncommented tests