get rid of warnings, improve test