Test had a broken namespace
Merge custom version of bultitude
Cleanup