Added testing tools, tests, moved files