Ajust test according to new data. More generic sollution. #175