little bugfixes + fixed friendlyid tests