make tests work again

- put OCHamcrest and OCMockito (with my modifications) in Frameworks
  folger