move test stuff over to shared space...