Added test files to git tracking.
Fixed conflicts