Added tests and other test files