fix import reference
fix unit test - use site.get_current()