added bootstrap and fixed tests