Adapted build system configuration to latest changes of ReMakeTest