small initial refactor
cleaned up formatting
resolved relative path problem in tests