Removed another unused datastructure
Renamed test suite file