Issue #495 Added more precise test assertions