Nesting improved to handle hamcrest