Moving test files to test and rewrite Bootstrap