Kinda fixing tests