updated core and testing classes