[IMP] Added tests