Changed layout/color of text, Changed some unit tests