tests back, few minor things