Test programs improved