worked a bit on tests - improved specs - also one small tweek to style