Fix tests
Fix tests + doc improvements + renaming