TEMP
Fixin some tests