more documentation
add tracking of clientId and some test logic