improve a bit tests