rework imports code to work on determining whether tests or code is
broken