Working on tests / coverage / documentation