MOD: just getting rid of unnecessary stuff in unit test