[IMP] Tests:

  * rename some tests
  * add some other one