Explored some more with tests; removed some, added others.
Added some failures, but that does not mean those really are. Need to
discuss.