Updated antunit test cases. Other minor cosmetic changes.