add startup method and updated tests