Add e2e test support

Fixed build. Added e2e support, but no tests yet.