Update/create tests for major classes