Make test build simpler and more like src build
Merge remote-tracking branch 'svalinn/test_fludag' into test_fludag