Added some files to prepare for tests
Minor fixes