Some variable name changes and added a session counter test