upgrade bootstrap to v1.1 + improve tests