Test Changes for fix #26