clean up testing syntax
:null => true should be treated as no :null at all
further syntax cleanup to some tests