Fixed tests
merged from master