Hamscrest and port hardcoded fix