More test classes, some errors resolved