First try of fixing tests