Test case fixes for serial no