fixing server load, still debugging some cdi stuff
fixing the tests for gradle