Added tests, deleted unneeded files