Unfinished attempt to adapt tests to new code