fixed placeholder End to End test class, tidied up imports a little