Correctly loading the classes; add unit tests.