Started working on the tests tast