Style changes, adding tests