Reworked cf-serverd acceptance tests