Tmp/test build update

review by @szeiger