removed 'inherited' in identifiers
updated unit tests