Changes uppd for v.0.05
Tests. No, really.