fix test suites and improve core bootstrap