added some tests, changed setUp function
fixed conflicts