delete old code and fixed tests
test
merge