Style fixes

This changes the style to that discussed in #4. I also simplified the tests to make each test only test one capability of the function.

Note that the style is entirely subjective, if you don't like the style in here let me know :smiley:.