Updated license/copyright information for tests
Fixed some indentation issues for inheritance