Improved atribute names in test entities