Tests fixed :)