revise bakend and tests