Removed Strings
Implemented Junit Testing