Args removed, small bug fixed.

Plus created complexed test.