Sorting out some tests trying to get them to work.