Merge the streams properly so the build actually works and add a production testign facility