cleaned up tests. moved objective functions to inc.