Several changes to tests
Tests