added styling, made tests simpler