updated bootstrap, made tests readable