Added target tests
Fixed conflicts