otw - A few test level modifications.