Reworked build, and moved test to demo project