Removed some unnecessary files, added some tests.