Get rid of broken macros, fix sp--get-string
Fix tests