Chore/add coverage

The last commit nukes commented out functionality that @patocox never wants to see again