Using asprintf over repeated strcats

Also fixing bug in mangled class method names
Removing test data dealing with classes