Some more tests and fix permissions