Test classes added
Added test files
Added files to handle conflicts
Test problem fixed