fixing tests
Merge branches 'fixing' and 'master'