Upstream testing changes
Created by: pR0Ps
Based off #155.
This just naively imports the commits from the upstream. It will need some messing with to make it work properly since the projects have diverged (in build configuration and functionality).