Fixed tests a bit