Test improvement + added session test