Changed port number in test
Added index for client