Add more test to figure out what is happening