Removing old bootstrap.php
Intermediate commit to rename test files
Second intermediate commit. Fixing tests.