mark nullability. move some old unit tests around.