added bootstrap and unit tests