GF33095; updated unit tests