Add test scaffold and cleanup imports