extract test, cs fixes, licences