Some other delegate changes, more tests, indenting