move test stuff back into main project