some improvments in tests