Started to fix some tests