making random annotations more tractable
more test improvements