tests, minor doc fixes

Unfortunately, I can't get tests to run locally at the moment, so these may break, but travis should run on them on my fork.