ticket:4 Add bootstrap and fix tests