Updated tests.
Changed style