Add test cases; add lacing support; defect fixing.