More complex testing. Also fixed so that no "base" class is needed and that all classes should be included in the "project"