took out tarantula tests, minor changes to other files for cleanup