Made changes to the tests to work as a standalone bundle