trying to fix hamcrest hell still