Added and modified test files