added bootstrap and some tests