More Tests

If people are bored - write some tests! If not - write them anyway! And put PRs against this branch.