Bugfix for endpoint test, greatly improved setup speed