Updates test to new module
Depends on D8555
Run tests
whoops, I will delete this shortly
rebase
remove debug