Test Class

Made a test class.
Renamed, added to comments