some tests and modifications