Pre 0.2.0 stuff, some api changed, tests now look better