incorporate test stuff