fixed broken imports
more tests