Adjusted Scope Of Project, Added Errors & Conditions To Make Tests & Functionality More Robust