Added tests and bootstrap