New: added tests