Updated use statements, test for ZfcUser & session test

Change-Id: Ia6f72d6ebd984f68036ab22c7842b27a1ba29f85