some changes from _test instance