Refactor test a little
Remove last reference to tellaye