More tests, made error logging from brp script more consistent