Cleaned up tests - added ids for terminal auto-complete and got rid of hardcoded paths