remove tests
add update functions
merge conflict