Fixing tests - thinking we may need a better class structure...