Fix/improve tests.