am 2df6840f: Merge "Add tests for missing classes"

* commit '2df6840f68dd18d7dd8dbf53f8b6181bbfdc4fc4':
  Add tests for missing classes