basic tests, improvements