cleaning up unit test and adding core data benchmarking