Checking in some tests. Expanded the MasterClass class