jUnit Testing being added
Cleanup