edited Test classes to reflect current objects