Do not raise errors with new instance
Refactor tests