Disable some unit tests
Fix case