some changes in tests - doesnt work yet, just some 'thoughts'