Test commented out, some changes