fixed tests, changed some views