add bootstrap and clean up tests