Switches to Identity, TODO: js auth and some more customized messages also extended tests