Removed no longer needed user id from templates.
Updated tests to recent changes.