Added functionality to specify array of splits

Also added / updated unit test framework and some other tweaks