Tests bugfix