Fixing minor issues with doc annotations, removing unused file, adding Shindo tests