Creating testing suite and moving code around.