Fixedup style, added tests