Update/create tests for major classes
Merge branch 'late-tests'