moved bootstrap files back to test dir to fix travis failing
fix tests