Updated tests
merged with master