Fixing tests
Work on docs