Added to the test suite and better organized it
Removed unneeded files