yet trying to make tests work, one more time