Changed everything to a working test