Working on docs and tests