New Additions, removed Component, Written some more simple basic tests, Some small refactoring