Add modules needed for testing.
Continue working on testing setup.