Prettied up Unicalc and wrote some more tests