Tests, improvements