#1: Removed some func.
#1: Fixed test dependency. Split method.