Refactor repor ttests
Add pivot module to sbt
Remove old module from maker