Added tests for serpent calling reform