Add the modified makefile and updated bootstrap.inc for the simpletest
ua change.