Prettyfied tests, added some tests.