Removed unnecessary files. Added several new tests.