Added tests and sessId field