Add some tests / improve coverage