Code after bug fixing and Passing Test Caqses