Add selection tests.

Still a couple to fix...