move tests to more correct location?