Keep adding tests, minor fixes.