Fix tests

My aim was to (1) have the patch as compact as possible while (2) having the limited test set as the default configuration - hence the _inversed_ pattern which the reader's eyes quicky adapt to IMO :)