Additional tests, deleted immature code.