Removing support_files for tests
Adding some tests