Merge "Add tests for missing classes"