sort out FIXMEs in base tests and move conditional _base_ to _extra_