Removed hard coded messages count from testing