Changed the tests approach