Updated w/ Bootstrap, simplified tests