Some styling from StyleCop and a few more unit tests