Bug Fix test code