enhanced test and added new one