Bootstrap + Fix tests