Added several tests; some renames.