chore(tests): update and refactor