move tests too