Add NicWollf Changes
Update the test cases