work in progress - fixing tests