Added new S4 Class defs and updated names in test.R