Fix imports
Attach tests to targets