some changes around testing