Basic tests and XML added