Fixed tests by making them configuration independant. #711