Added unit testing requirements nd made some other changes