Prepared, but not written, some tests
Small changes