Added more tests.  Added some styling.