Fix tests and rename collections