Tests finally working