Import class
Improve the tests