Fixing formatting, unit test