more annotations, a few changes to tests