Fix tests and rename module