Done some of the testing part