Adds some Tests

@andyburke  what do you think? I go a small amount of code coverage done.