Reordered keywords and tests and refactored robot todo tests.