Additional tests. Further work on form. Trying to figure out weirdness and failing.