Start of a hopefully better working test compilation