Added bootstrap for tests
Altered test files to use bootstrap