update deps and put tests in right place