Additional test cases and implementation.
Additional tests; additional TODOs; skipping a test for later.