removed some setup methods in tests

* removed some setup methods in tests so that the 
   beanfiller isn't called twice for one test method where
   it isn't needed. Instead call it in every test method.