finish tests, cleanup, remove todos, blindly copy options