fixing tests - work in progress