Fixing bugs during testing