fixes in testing