Test programs and fixes made