Hamcrest fix (removed - not required yet)