Added tests
Added bootstrap