Adding Apache test 
Adding Berks support