Fixes in testing