[#2698] Fixed test case
[#2492] Various MS Access fixes