adding @Startup and corresponding tests