removed unlogical test
fixed constructor complexity
fixed constructor complexity