Add unit tests
Reorder classes alphabetically