Fixin some tests and schema