Fix tests, introduce hacky +=$ operator (need a better solution)