Adding clistyle, cleaning up tests.